Merge version 3.0.21-0+deb12u1+rpi1 and 3.0.22-0+deb12u1 to produce 3.0.22-0+deb12u1...

diff --cc debian/changelog
index c32be211ea513878d12937e7c92813457efcd4ec,6ce4f324e850039f0bd03280ebec0222fe369e2e..a8700d5f6f6dfb8fcd39688a0be01a337861154a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.21-0+deb12u1+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.22-0+deb12u1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2020 00:37:35 +0000]
 +  * Add extern to three functions for gcc-10 compatibility.
 +  * Partially fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jun 2024 23:25:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Jan 2026 05:00:37 +0000
++
+ vlc (3.0.22-0+deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream version 3.0.22
+   * debian/: Re-enable VAAPI support (Closes: #1021601, #1013898)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 13 Dec 2025 23:56:12 +0100
  
  vlc (3.0.21-0+deb12u1) bookworm-security; urgency=medium
  

diff --cc debian/rules
Simple merge